Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding compatibility with tensorflow2 #17

Merged
merged 7 commits into from
Apr 30, 2021
Merged

Adding compatibility with tensorflow2 #17

merged 7 commits into from
Apr 30, 2021

Conversation

pzinemanas
Copy link
Collaborator

@pzinemanas pzinemanas commented Apr 29, 2021

This PR is related to #11 and #7. With this implementation, we maintain compatibility with tensorflow 1 and 2.

@pzinemanas pzinemanas requested a review from mrocamora April 29, 2021 14:08
@codecov-commenter
Copy link

codecov-commenter commented Apr 29, 2021

Codecov Report

Merging #17 (8f3d64f) into master (74cf0e3) will decrease coverage by 1.38%.
The diff coverage is 52.45%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #17      +/-   ##
==========================================
- Coverage   74.48%   73.09%   -1.39%     
==========================================
  Files          21       21              
  Lines        2038     2078      +40     
==========================================
+ Hits         1518     1519       +1     
- Misses        520      559      +39     
Flag Coverage Δ
unittests 73.09% <52.45%> (-1.39%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
dcase_models/data/features.py 90.55% <0.00%> (-7.74%) ⬇️
dcase_models/model/models.py 92.15% <48.38%> (-5.09%) ⬇️
dcase_models/model/container.py 72.43% <64.28%> (-1.72%) ⬇️
dcase_models/data/data_generator.py 92.39% <80.00%> (-0.39%) ⬇️
dcase_models/util/callbacks.py 98.96% <80.00%> (-1.04%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 74cf0e3...8f3d64f. Read the comment docs.

strategy:
matrix:
python-version: [3.6, 3.7]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we add python 3.8?
https://www.tensorflow.org/install/pip

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we should. I'll add it.

Comment on lines +38 to +40
pip install DCASE-models[keras_tf] # for tensorflow 1 CPU-only version
pip install DCASE-models[keras_tf_gpu] # for tensorflow 1 GPU version
pip install DCASE-models[tf2] # for tensorflow 2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool :)

'sox==1.3.7',
'sed_eval==0.2.1',
'numpy>=1.1',
'pandas>=0.25',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need pandas?

Copy link
Collaborator Author

@pzinemanas pzinemanas Apr 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we have to implement a read_csv function which is the only thing we are using from pandas (see #18 )

@pzinemanas pzinemanas merged commit e861925 into master Apr 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants